testsuite: put installed tests in the right place

Follow the prevailing practice and put the installed tests
into $libdir/installed-tests/$PACKAGE instead of
$pkglibdir/installed-tests.

diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
index 1176e712ad16cf39c85d8c25deb0cf5a07341fae..96e3e8b2b753a4b455738b495bed559fbe28ad98 100644 (file)
--- a/testsuite/a11y/Makefile.am
+++ b/testsuite/a11y/Makefile.am
@@ -97,14 +97,14 @@ test_in_files = \
 EXTRA_DIST += $(test_in_files) $(testdata)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = $(TEST_PROGS)
 
 a11ytestdir = $(insttestdir)/a11ytests
 a11ytest_DATA = $(testdata)
 
 substitutions = \
-       -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+       -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
 
 test_files = $(test_in_files:.test.in=.test)

diff --git a/testsuite/a11y/a11ychildren.test.in b/testsuite/a11y/a11ychildren.test.in
index 927cfe32b7b3e8a43d271f769a110527d33b3558..3424d6ff82544f54f48878f34ce134c81b1ab311 100644 (file)
--- a/testsuite/a11y/a11ychildren.test.in
+++ b/testsuite/a11y/a11ychildren.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/children"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/children"
 Type=session
 

diff --git a/testsuite/a11y/a11yderive.test.in b/testsuite/a11y/a11yderive.test.in
index 665b2e901affac898be79ebedce6c5ac7a273318..12de661525eb9af8008d3bb9e9bea022dedfe353 100644 (file)
--- a/testsuite/a11y/a11yderive.test.in
+++ b/testsuite/a11y/a11yderive.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/derive"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/derive"
 Type=session
 

diff --git a/testsuite/a11y/a11ytests.test.in b/testsuite/a11y/a11ytests.test.in
index b78b55fa36b946e99ddfd57a208e6a8377cbb7cb..acf2acd95cf7898a8474693be778b604c404761c 100644 (file)
--- a/testsuite/a11y/a11ytests.test.in
+++ b/testsuite/a11y/a11ytests.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/accessibility-dump -k --verbose --directory @pkglibexecdir@/installed-tests/a11ytests"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/accessibility-dump -k --verbose --directory @libexecdir@/installed-tests/gtk+/a11ytests"
 Type=session
 

diff --git a/testsuite/a11y/a11ytext.test.in b/testsuite/a11y/a11ytext.test.in
index c3435edb2a279f13a879f7170201156961e76616..3bac807a50e46b7d72aa602327fb20c442f685c5 100644 (file)
--- a/testsuite/a11y/a11ytext.test.in
+++ b/testsuite/a11y/a11ytext.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/text"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/text"
 Type=session
 

diff --git a/testsuite/a11y/a11ytree.test.in b/testsuite/a11y/a11ytree.test.in
index 390d1a516567a013a25358b89c33a7f8859899d8..4a9771eadcca879f8bc97850739e7c2b2978788c 100644 (file)
--- a/testsuite/a11y/a11ytree.test.in
+++ b/testsuite/a11y/a11ytree.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/tree-relationships"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/tree-relationships"
 Type=session
 

diff --git a/testsuite/a11y/a11yutil.test.in b/testsuite/a11y/a11yutil.test.in
index 9140b9fa1abc755d8bb36d336689d9d87770f337..311c8f31a335549ac833ab30504e688fd227f03d 100644 (file)
--- a/testsuite/a11y/a11yutil.test.in
+++ b/testsuite/a11y/a11yutil.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/util"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/util"
 Type=session
 

diff --git a/testsuite/a11y/a11yvalue.test.in b/testsuite/a11y/a11yvalue.test.in
index ddc16e24a5d456ed7877c245abc32b744f29fe44..5df76fd07a4536801bbd900a50925e4f470636c4 100644 (file)
--- a/testsuite/a11y/a11yvalue.test.in
+++ b/testsuite/a11y/a11yvalue.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "@pkglibexecdir@/installed-tests/value"
+Exec=/bin/sh -c "@libexecdir@/installed-tests/gtk+/value"
 Type=session
 

diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am
index e88e12d48bb7021d32b415277c7c0b910e3dbac6..d38fa8e89c7ef66148317346c1e059dcf9b76a3d 100644 (file)
--- a/testsuite/css/Makefile.am
+++ b/testsuite/css/Makefile.am
@@ -28,11 +28,11 @@ test_in_files += api.test.in
 EXTRA_DIST += $(test_in_files)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests/css
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css
 insttest_PROGRAMS = $(TEST_PROGS)
 
 substitutions = \
-       -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+       -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
 
 test_files = $(test_in_files:.test.in=.test)

diff --git a/testsuite/css/api.test.in b/testsuite/css/api.test.in
index 7966f5a2367907eb1a264488d47696c82a739044..13bba4d6c9201f655400f1a01c23f77ba3e660da 100644 (file)
--- a/testsuite/css/api.test.in
+++ b/testsuite/css/api.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=@pkglibexecdir@/installed-tests/css/api
+Exec=@libexecdir@/installed-tests/gtk+/css/api
 Type=session

diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
index 084a340a3dcd28d8f0d8ce8d60659908e348ef16..e9ab80f0e6c5a6276329a20b7a7ccf643132bde2 100644 (file)
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@@ -353,12 +353,12 @@ test_data = \
 EXTRA_DIST += $(test_in_files) $(test_data)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests/css/parser
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/parser
 insttest_PROGRAMS = $(TEST_PROGS)
 insttest_DATA = $(test_data)
 
 substitutions = \
-       -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+       -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
 
 test_files = $(test_in_files:.test.in=.test)

diff --git a/testsuite/css/parser/test-css-parser.test.in b/testsuite/css/parser/test-css-parser.test.in
index 0b3c0ed6598b994fbcadc6e64b86c0b5280ee757..91fd581cbe18517c45f5b8843579bd6ae33d9acc 100644 (file)
--- a/testsuite/css/parser/test-css-parser.test.in
+++ b/testsuite/css/parser/test-css-parser.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "cd @pkglibexecdir@/installed-tests/css/parser && @pkglibexecdir@/installed-tests/css/parser/test-css-parser"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && @libexecdir@/installed-tests/gtk+/css/parser/test-css-parser"
 Type=session

diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index 0f5f960ba6f0af7849aa5a30186f8b9204d2dc14..5b0d30f08677856b548f8f2cb2d7ec0d7872f366 100644 (file)
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -30,7 +30,7 @@ CLEANFILES =                  \
        $(NULL)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = $(TEST_PROGS)
 
 %.test: %$(EXEEXT) Makefile

diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 629402df919c514b9f297184617c0f38dacc44b6..a2f6fc690d727a39893a04ad69dd39904306e428 100644 (file)
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -162,7 +162,7 @@ gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS)
 all-am: gschemas.compiled
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir = $(pkglibexecdir)/installed-tests
+insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = $(TEST_PROGS)
 nobase_insttest_DATA = $(test_icontheme)
 

diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 50fb091fb68c40fe5c4c5aa327979fdfd0b36798..7c63241f73b3c373df210cc67ece8c718e521f98 100644 (file)
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -344,7 +344,7 @@ EXTRA_DIST +=                       \
        $(NULL)
 
 if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests
+insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
 insttest_PROGRAMS = gtk-reftest
 
 reftestdir = $(insttestdir)/reftests
@@ -361,7 +361,7 @@ libreftest_la_SOURCES =                     \
        $(NULL)
 
 substitutions = \
-       -e s,@pkglibexecdir\@,$(pkglibexecdir),g \
+       -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
 
 reftests.test: reftests.test.in Makefile

diff --git a/testsuite/reftests/reftests.test.in b/testsuite/reftests/reftests.test.in
index 93632e1c975644643362060dbef82348668b2ac1..0dbf25f747fa976c3c7d89647644bad7ac3d28e8 100644 (file)
--- a/testsuite/reftests/reftests.test.in
+++ b/testsuite/reftests/reftests.test.in
@@ -1,3 +1,3 @@
 [Test]
-Exec=/bin/sh -c "GTK_DEBUG=icontheme @pkglibexecdir@/installed-tests/gtk-reftest -k --verbose --output $(pwd) --directory @pkglibexecdir@/installed-tests/reftests"
+Exec=/bin/sh -c "GTK_DEBUG=icontheme @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive